Various bugs fixed + Tests implemented

Closes #4

Merge request reports

Loading