Removing cruft, adding functional tests into mocha suite
build-7