Further test integration