Fixed up (record?)
Fixed (record?)
Added test cases