Fixed most bugs from Zeam related to existing tests