Continued with unit tests

Also reformatted auto by mistake :)