Reverted changes to junit and mockito imports in the Observable class.