add one more test, minor changes