Testing

Moved testing code to master