Updated tests and test descriptions