Testing

All tests green. 87% coverage.