Test style rule simplified
Tests cleaned up