Tests corrected (classes renamed). Please do a review of the tests. Fixes don...