Re-org tests
setup quickCheck tests REBASE THIS COMMIT LATER