Cycamore hotfix

fixes some naming issues in tests that only crop up when you combine with cycamore. this issue should go away once we incorporate source and sink facilities in cyclus.