@aiten variable unit test cleanup and re-work