Moving some test code around and added new tabs module file which are better