resultset model fixes and passing unit tests