Bugfix
Tests