Simplified unit tests