Additional unit tests and code coverage for Movie Categories
Refactor and clean up ugly code. Add more unit tests.