Added aunit tests