Added tests & moved usings around