Renamed class, simplified+added unit tests.