more updates and removed extra tests files