Examples update
Test changes
Fixed bugs