Expanded constructor. Switched cases. Aded test.py. Added test.orig.py