Added test cases
More testing...
More testing updates