changes to tests to reflect version 1.0/2.0 for #20