Merge pull request #229 from deadok22/master

IntroduceRecord tests and an improvement