New testing framework
Updated todo
Improve pattern syntax