Fixed Record and tests