updated tests n stuff