Moved to py.test unittesting framework for simplicity