working on tests..