Update tests for better reading