Update: Improved Testing again