Cleaned up fixtures