unit tests set up, minor UI changes