fix tests due to change on code in prev commits