Revert 5 feature/tests update