changing methods
tests fixes