Added links, cleaned up the tests (make sure you migrate the DB when this is done)