Add make test and other small cleanups Upstream-commit: 4746864c2b405bcb2526df20d572b9de9df7f3b1 Component: engine