finished test 1
finished test 2
cleaned up code