fixing tests, adding more methods.