Add exclude param
Rewrote all tests