Setup part added and tested