Added testing and configuration