Updated tests and classes to match.