Fixed features
Fixed another feature tests
Fixed another test