Updated lots of testing