More Her0 class and spec refactoring