Got test coverage up to 93%