Updated requirements, added to unit tests.