Refactor Tests | Update Boostrap Spacing on Forms