Re-add removed methods
More tests