Fixed tests (forgot to recheck after refactoring)