added tests and fixed test names