Made some methods private
Some tests now only for the public methods