Added more tests, tryin to get the singleton pattern to work.