Added various tests to fill in coverage gaps