Change some naming; Organize tests a bit;