Revert "Test fixes"

This reverts commit 11f244baa39baff3a50b602fbc32ccdb512d3fee.
Revert "Testing"

This reverts commit b03206383e0b80cd648cfc1c518d98addfe35d05.
Fixed tests