[#6829] Minor fixes, added tests

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
12 files changed