Updated Acceptance and Unit tests
-fixed wrong id prepended to file