Almost there with tests
Moving app stuff
OK with tests