Tests

@mridgway