Thanks jondiy.
Regarding the Building Control, the officer had made several building checks, and explained that he would require test certificates for the electrics. No mention of a Part P electrician to perform the work, but we did explained that I was once a JIB Approved...