Watching src files
Fixed focus management, added forgotten tests