more test scenarios added and cleaned the code
code cleaned and attribute error added
calling wrong attribute fixed
updated some fails