Improved sanity-tests

Change-Id: I328d77a755c4185c412d74192a6a72ef5f641c54