Name changes and update to testacular