restore isolation of tests within Y

description here https://trello.com/c/sshrJl6Y

need to verify