Fixed failing tests because of Aorist changes