Test reorganization, updating dot, including dot unit tests in Scenery unit tests