Made unit tests working (again)
formatted tests