Updating to use input base. Adding more tests