Add Tests + Update Auth