Added static constructor for scanner
Made tests more terse