tests refactored & autoload added