Add birth spacing tests and logic rewrite