Added P16
Added P17
Simplified tests
Merge branch 'testCleanup'
Added P20