JUnit file update

Methods renamed
Methods added