Tests: updated them and moved to proper place.