Refactored tests to test each source file separated