Refactored some code and edited test report week 2