Moved FTs into their own individual files"
refactored deploy templates
Added failing test for empty items