Fixed tests and added discover-runner to requirements.