Added initial version of new tests. 1st test pass, good stuff.