Added some code in order to be able to write some actual tests