3 Test cases added. Code cleaned