Added basic tests
Fix grandfathering clause
v0.002

          Fix grandfathering clause
          Added basic tests