Add backwards compat of
make tests more like real usage
more tests to track potential issues