Work around @import bug and re-enable style related unit-tests