Add some testing infrastructure
Added additional test cases