More tests to ensure singleton