completed manifest class refactoring and tests