Better readability in tests and minor cleanup