More code; rename exception and tests