Simplify sector lookup
Moved sectors to fixtures file