Major refactor of  different tests