Integration tests, changed routing & linked 'em