cleaned up and added more integer tests