Bugfixes
Unit testing