Updating tests and some simple cleanup.