Start working on CR test passing