More debugging/updates, removed irrelevant tests after cleanup from last commit