Added include wrappers and split sort test to new file.
Add timing file for sort functions.
Small updates.