Added more tests!