Cover locked issue #95

Added functional testing, this closes #95