Halfway to implement init-setup interaction

Small changes in Tests to fit new constructors