Added unittesting