Move some userstories test to right location.
Rename project tests.