Used static path
minor changes to tests