get tests passing on stage1