Merge pull request #49 from jrioux/tests

Fix @slow failure in test_query.
Merge pull request #50 from jrioux/tests

Fix slow tests in test_trigonometric.