Improved tests syntax

Use more sophisticated syntax