added tests and collections