Testing

Integrate tests