moved more methods to test.py