All non-targets tests now passing!!!!!!!