Non-existant waiton check, updates to unit tests, various fixes from refactoring fallout