ENH: Addition of tests