wrote test to check the bounds of the field
fixed merge errors