Added further tests and items to configuration