changes to allow for running in vagrant vm
comprehensive tests