uncommented tests
fixed friend declaration