adding more tests and fixing couple force-sobject bugs