Fixing build and making unit test slightly better.