Updated feature tests and passed em