Updated tests and various other parameters