Updated to use tests category and test layout for the tests