added more tests!