Worked around failing tests
Removes singletons - closes #4 - although some singletons persist