fixed test
code tidyup
code tidyup