Akash - fixing remaining tests