Feat/alex wan/tests

Tried both, compilation syntax error for both.