Note another approach and move tests around