PSR2
Add more asserts to test library