Add unitests