added tests, changed a couple errors

Merge request reports

Loading