Further unit tests