refactoring
use runtime exceptions, update replacement test
moxy refactor 2