Build Update
Fixed UnitTest inconsistencies
Fixed xreplaceFirst function