Added more tests and room to expand testing more easily