ISPN-3447 Remove old legacy tests and fix compilation