Added tests, abstracted the faker util