Tests work with new setup