Adding systematic tests