moved test into correct package
removed unnecessary private synchronized modifiers