Test classes added. Still need quite a bit of work.