Added a few more specs. Modified a few method names to be more descriptive