added tests (jrogers)