Added tests for NameMatchesPredicate
restructured some files