Added Scanner tests class
Tidied Scanner source files