code cleanup. add one more test