Modified tests to include categories