I posted a month or so ago on an ignition problem. We finally got the steering wheel off and the correct ignition cylinder installed--and the car still wouldn't start.

The initial problem was definitely the ignition cylinder; I could see a part that had snapped when I took the old one out. But now something else is wrong.
The car had been sitting a while, so we thought maybe it was the battery, even though the cables had been disconnected. But it won't start with the new battery, either.
When I turn the key, I hear a clicking from the engine bay--not the clickclickclickclick you get when you hold the key and the battery is dead, but a click when I turn the key on and a click when I release the key. I read somewhere that it's possibly the solenoid, and my dad thought maybe it's the starter. I haven't been able to check this yet, because I can't figure out where the starter/solenoid is! I have the Haynes manual, but I can't find any pictures that show where these are located. I'm also not sure if they're integrated or not; I read someplace that they are and some other place that they're not. Can anyone help me figure out where they're located??
Also, I've heard it's a bit of a hassle to actually get in and replace the starter (i.e. get under the car and dig around a bit). Is there a way to test to see if the solenoid is the problem or the starter before I start pulling everything apart?
Thanks for any help/suggestions.