[Issue #370][WIP] Finished tests