Fixes, updates, add new tests