Improving the tests

Finished init tests