Added test
Merge branch 'WAL-15' into development