Static and Single productivity tests added