Refactor test classes and add test for no asset collection.
More changes resulting from PR review.