Fixed awkward test integration