Cleaned up 42 and added test cases.