Pip logic improvements and **way** lot more tests!