WIP: clean up unit testing.