Adding back more tests

Behavior Snapshot tests are failing