Fix several test issues. Reorder entry conditions to controllers. Filter locations per assembly