fix the tests
rename functions and methods to be more clear