Cleaned up scripts and running test