3.0 typos and folder correction

This isn't necessarily a cut-n-dry copy and paste anymore, as this file is namespaced to `TestApp`.