Merged Barbara's updates from SVN repository
Finished improvements for tests