Moving some tests from smoke to FT and refractor code to reduce smoke/ FT run time