Added functionality and tests to FSQ.