added tests, fixed GetAll