Fix tests, change if condition to correctly determine forwards [MJ-706]