Fixed a few tests and a minor UI-change