Merge: Cleanup tests