make tests functional (do not pass yet)