Fixed/Added more tests