Updated tests and config