Fix cs
Add test
Change self into static
Add generic manipulator exception