Revert "Restored working tests"

This reverts commit 118e088d54bfaee1c357ec4fb58110fecbb25e92.
Revert "Revert "Restored working tests""

This reverts commit 75c66e0941fd281666145072aed787c2372fd743.
Revert "Changes start to pluses"

This reverts commit d17aa78aac9054d008467c2980c53dd78864956a.