issues #1 fixed test and oops