cleanup, whitespace
cleanup, whitespace
cleanup, whitespace
cleanup, whitespace
fix failing test

This reverts commit 0c29a770df4a7166ed7d5ea8708986d61e655a65.
fix failing test

This reverts commit 8ecd8f45b534f30f5ec2264e7f85b149b643235b.
fix compiler error with MockBuildSettings

This reverts commit 580f843e08b06b4853ad881011b8a2c46dbfcb0a.