Cleaning test strings

Also added latest master from Stash