Improving omega tests wip