Fixing checkstyle
Adding some more Tests