Clean up settings a little bit
Begin test writing
Add some tests