Moved Uinit and tdd testing to seperat class and fix a few small
formating issues.