Even further improved test, fixed licence notices.