Added more test for increase and decrease.
Also refactor some odd names.