Added more tests...