Temporary tests to be removed