Added more tests, and working on getting a full list