Test Fix -Checkstyle - Trello 174/184