added mp3 tests
added mp3 tests, fixed merge conflict
added error test file