Improved unit tests a bit