renamed tests, finished adding plans test