More tests added, need comments