Fix test setup
BZ-950
BZ950: Add release note. Remove old test. Code reformat