Renamed some classed and improved test.
Version up to 0.5.0.