tests, updates, additions