Reworked test framework and foundation for new category functions