Fixes for two tests in develop