Updating tests for nil and removing stale file