More test cases passing
Merged tests into single file; More tests passing
New tests