more specific op tests
more op tests
more test tidying