Switched to py.test for testing