Added VP tests and fixed bug in NP completion.