Update exercise test from exercise 5 and refactor test directories