Cleaning up my tests and tightening some of my logic.