My code and tests... oops