ENH: Adding more tests