Fix regex patterns
Fix some tests, stop angular from loading twice
Complete neighbor spec