Reorganisation and updating of test_kite.py