added nicks switch block and a few tests