More tests from previous commit