Mark tests incompleted
Fix naming convention
Add variables for tests