Merge "Remove tests (6/n)"