Refactored Formatter/Link
Added new Formatter
Refactored formatter/test*
Refactored Filter/Test*