Fixed null pointer exceptions
All but one test succeeds
Have one test passing and one failing