Reorganized to start writing basic automated tests
First test, sort of