Update Specs, Optimize SQL Queries

Created specs with nearly 100% model coverage. Optimize SQL queries using ARel rather than Ruby