Updated tests to work with buster 0.7