Rewrote plane methods in line with tests