Updated tests and config
Updated tests