Minor update, starting to write some tests.