Add main test and suite classes