Unit testing; changed some behavior to something making more sense