Removed useless Tests & Theme support