Added login/out testing and updated filters