With POC experiment complete, lets back track and restart properly with tests