Broke up collections and started testing