Changed devDependencies & added more tests