Updated target names, removed broken tests.