Minor changes and Some more tests