Add tests and move_to_whitelist option