fixing some compile errors and removed problematic test