first round of tests...
(cherry picked from commit fe7156e4ea6d26894f1270563c8bf290364e1bed)