Feature/adrian/test

@adib007 from ubuntu