TESTS: updated tests re: issue #505