revamp test/login