Changes to tests for Calvin's suggestions