testing refactor, re-wrote singleton and added testfixturesetup