fix tests - start writing variable functional