Formating changed. Checkstyle fixed. Tests extended and fixed