FIX: More comprehensive testing