Work in progress on finishing up the test suite. Almost done!