Fix failing tests, add backwards compatability