FS-28 Tests fixed