Added tests to ensure casting was removed