Move to pytest for testing