Adapted to newest libs
New testing framework with better syntax/flexibility
Remove comment