Move dev stuff into dedicated feature folder
Add test location matrix question