Update last specs, fixed errors and extended test program