FAIMS-322: fixing broken test
FAIMS-322: cleaning code