ES-152 latest changes in tests and cancel button