working on tests...