diff --git a/test/flyweight_test.cpp b/test/flyweight_test.cpp
index 118f24e..5d018c6 100644
--- a/test/flyweight_test.cpp
+++ b/test/flyweight_test.cpp
@@ -10,13 +10,13 @@
     Foo() = default;
     explicit Foo(int i) : iv_i(i) {}
     int get() const { return iv_i; }
-    bool operator==(const Foo & i_r) const { return iv_i == i_r.iv_i; }
-    bool operator<(const Foo & i_r) const { return iv_i <  i_r.iv_i; }
+    bool operator==(const Foo& i_r) const { return iv_i == i_r.iv_i; }
+    bool operator<(const Foo& i_r) const { return iv_i <  i_r.iv_i; }
   private:
     int iv_i = 0;
 };
 
-Foo & addFoo(int i)
+Foo& addFoo(int i)
 {
     return Flyweight<Foo>::getSingleton().get(Foo { i });
 }
@@ -25,7 +25,7 @@
 {
     // Add some unique entries in a random order and keep track of where those
     // enties exist in memory.
-    Foo * a[5];
+    Foo* a[5];
     a[1] = &(addFoo(1));
     a[2] = &(addFoo(2));
     a[0] = &(addFoo(0));
diff --git a/test/simulator/hei_sim_main.cpp b/test/simulator/hei_sim_main.cpp
index 166b54e..58784d0 100644
--- a/test/simulator/hei_sim_main.cpp
+++ b/test/simulator/hei_sim_main.cpp
@@ -4,7 +4,7 @@
 {
     using namespace libhei;
 
-    void * buffer = nullptr;
+    void* buffer = nullptr;
     size_t sz_buffer = 0;
 
     initialize(buffer, sz_buffer);
diff --git a/test/simulator/hei_sim_user_interface.cpp b/test/simulator/hei_sim_user_interface.cpp
index ad27981..f1025c9 100644
--- a/test/simulator/hei_sim_user_interface.cpp
+++ b/test/simulator/hei_sim_user_interface.cpp
@@ -6,7 +6,7 @@
 
 //------------------------------------------------------------------------------
 
-ReturnCode registerRead(void * i_chip, void * o_buffer, size_t & io_bufSize,
+ReturnCode registerRead(void* i_chip, void* o_buffer, size_t& io_bufSize,
                         uint64_t i_regType, uint64_t i_address)
 {
     ReturnCode rc;
@@ -30,7 +30,7 @@
 
 #ifndef __HEI_READ_ONLY
 
-ReturnCode registerWrite(void * i_chip, void * i_buffer, size_t & io_bufSize,
+ReturnCode registerWrite(void* i_chip, void* i_buffer, size_t& io_bufSize,
                          uint64_t i_regType, uint64_t i_address)
 {
     ReturnCode rc;