Added first few tests to address issue #12