Beautified recorder and added temporary test