Removed depriciated tests and moved script outside module