Refactor tests based on demo feedback
Shileds buckle

Also added initial game play driver