some fixes and more tests with records