Fixed some tests.
Updated init to be...drumroll...more awesome.