Set up tests skeleton and moved to full composer control