Add tests from the make branch

WIP