Adding more tests!