Beginnigs of rewrite of testing facility