Fixes #274 reorder unit tests