New requirements
Fix tests and a few bugs it brought to lite