[Unit Testing - Matchers] Fixed tests a little bit and moved the directory