Fixed src
Fixed and removed some tests