Update comments
Make unit tests work on Vagrant development environment