Adapted unit tests to new design