Tests added, need to get correct results.