Cleaned up testing