GH #6 - Working on tests.