Made retract() work, disabled testTrackRetract() because mediapackage in test env is not the same
Merged Test.java