Commented out unit test work in progress