Add remeber me functionality and reorganize tests