Added missing implementation of US2FormEntry
Cleaned up a bit
Aligned unit tests to former modifications