Added testing and patterns