new tests #80
more tests passing #80