Bug/failing tests

Fixes failing tests.