Moved Main into test-spec, updated test deps to build