Removed unneeded tests & dissected classes