Feature/console output

Need to fix output tests