Itunes UT + some refactoring