Initial testing setup and move away from singelton pattern