Cleaning up some tests. Adding more functionality to others.