Add several test cases, adopt build to be able to run those