Manual updated, testdata added