merging test files


@gissues:{"order":50,"status":"done"}

<!---
@huboard:{"order":9.0,"custom_state":""}
-->