Checking in unit tests and logverifyvariable in current broken state.  Will finish this evening