Modified the tests not to fail due to backend changes and some clean up