WAP tests update
Code improvements
Merge pull request #4 from gerardo-prieto/develop

Develop