updated/more tests
brevity