Akash - fixing some of the broken tests