BUGFIX: Unit test