Added future tests