1) Updated test.py
2) Some fixes