Add tests for convenince functions, fix convenience function defs