Fix functional tests and remove test output files

Signed-off-by: Jesus Fernandez <jesus.fndz@gmail.com>
Merge pull request #121 from jesusOmar/dev

Fix functional tests and remove test output files