Add future tests