Fix tests after refactoring into separate proj