Updated to new format for most tests
Added more test cases