addind swagger and refactoring test
updated test with new bootstrapping of servicess