updated tests, more methods