Add tests from execrise 5 and refactor test directories