Add assert messages
Minor: remove outdated todo comments
Fix syntax errors in test
Add accessors to dictionary
Refactoring: remove warning
Refactoring: remove local function
Refactoring: move inner class to package level
Refactoring: remove unused variable, invert if (move common case to general return, remove boolean invert operator)
Redeclaration for same file in different files