added unitests