Merge "Move tests to .test package"