Added more tests, and some minor formating changes