#19 Remaining unit tests.