Tests + fixes for backward