Update and fix test functions names