Cleaned up some tests and moved some methods.