First tests; making the infrastructure pieces testable
Further testing