Adapt tests to new library structure