Added tests and got new reference code to compile, though not yet
working