First few features tests green

Semi-functional