initial commit of cleaned up testing code