De-twill project tests

Part of an ongoing de-twilling process. More related commits to follow.
Merge pull request #1493 from onceuponatimeforever/detwill

De-twill project tests