Adding more tests (need work)