ENH/TST: add more advanced exercises