Polish test
Rename and organise code
Put UI tests in their own directory