Reverse logic
Update tests for new packages and use regexp matching