Added more unit tests and changed some variables.