Fix unit tests and tweak styling