Finished adding functional design cases as tests
Merge remote branch 'origin/master'