#420 Rewrote to separate tests