Refactor

Vagrant dev-environment
Updated tests