Added more tests and main.py, and checked they run