add test classes
remove collection class