Small fixes for test.py