Added units test