Added additional test classes