Cleaned up error handling and validation of score test