Completed fixes to Javier's tests