added tests (but old tests now fail and i don't know why)