Cleaned up common fixture