Migrate tests to cleaner in-code structure