Adding Plans and some tests