updated tests, and fixed one bug in methods;