Add full Tests