#23 Moved the tests a bit.