ticket:1 add test and fixtures
ticket:1 Merge branch 't1_nethen'