Test cases passing
Fix checkstyle