Switch back to using an init
added unit test