Renamed some classed and improved test.
up version to 0.4.7.