Updated test_collection to remove pyunit dependency.
Converting the controller class into an observer