added initial test from master