Test and TestDao removed