Cleanup code, add a new test for record having too much data, change java.lang.exception into java.lang.IllegalArgumentException