Renaming test directory
Adding collection tests