Moved tests to own file, added records method