Added some tests and code needed to get them to run, if not pass.
Starting to build the infrastructure needed for this.