Tidied up login screen + minor unit test improvements