Fix test.sh paths that used old name
Split out control and application keys