Issue #310 fixed. Refactored code to use a single method to know if a ta...

Wrote specs for the new methods. Tell me if I missed anything!