Added code to include sport type, added tests, fixed a bug in test script