More updates.
Update test and move blacklist to separate file.