Need to test sampling is correctly working + some cleaning on acceptance tests