Refactoring tests, and also added in movie collection tests