ticket:5 for #5 fixup tests for stage