Updates to the Sport JUnit Test and implementation.