Adds tests so this can get merged with smiles