added tests (including one failing)