Updated tests for pytest