All requirements fulfilled

Requires improved test data