Oops
Adding / fixing tests