Added more tests to main