reimplemented tests to match refactor