Test updates and Bug fix