Unit testing moved to abstract singleton