style consistency
more tests