Add Haswell to CPU tests

These tests need a lot of work...