Update after test

Some changes needed to work properly.