FAIMS-347: cleaning up code
FAIMS-35: fixing broken tests