starting to work on tests (finally...)