mockup added + test updated