More work towards getting the code running.
Added more tests