Removed dependence on coffeekup in test suite.