* Migrate tests * Cleanup * Migrate tests * post merge fix Signed-off-by: Bjarke Berg <mail@bergmania.dk>