Added Tests (and fixed URLs)