Fixes from test