Better structure but still with errors on test.py