More tests simplified, converted to py.test