Added more Cat 1 testing