Refactor tests and code to accomodate collection instances