improving accepting/parsing parameters
improving tests, making reliable
fixes to make joins tests reliable
Fixes for issue #2 to make tests more reliable. Merge branch 'fix_tests'