refactored spec
added link tests
refactored tests again