Add functionaltest & login enhance