Actually adding tests inspired by @ndyakov for real this time