Integrate new tests, small refactor of classname handling.