Corrected some syntax. Added more tests.