About 50% test coverage now