Unit testing cleanup; test asset inclusion