More unit testing.
Bugfix