fixed bug in test constants, added more toggle options