Added more test cases

Added back all tests that run to completion, and noted the ones that do not.