small refactoring, test build working with new library added