working on tests
changed something...