Switched to py.test unittest style