Re-running tests, coverage needs improvement (28%?)