CFxp: Cleanup and constructor argument bugfix
CFxp: Added more constructor unit tests