Enabled more tests to pass!