JUnit tests and some methods renamed to match lowerUpper case standard