Getting rid of functional test