added some tests (hope so)