1. remove unused unit tests

2. use fluent assert in matcher tests