Removing a very unncecessary self defining function.  Adding a test for easy testing