Devon Tests fixed and updated