Fixed tests for new handler methods