remove unused test classes, more format cleanup