Updated (but not completed) object functions tests