Moved some test logic to shared code