Fix Tests to work with new architecture