Minor refactor; Fix manager specs