#50 More tests