* fix classes to match unit tests