fix. formatting.

Change-Id: I96dad623a74f90a227b722045161b5b241202ac1
add. Test that sartoris correctly implements singleton.

Change-Id: I7a800592256b339bbcc43158b3d6345d1127e81d