updated some toml
fixed mispelled method name and updated some tests
updated tests to reflect changes due to changes. Coverage is down, tests need to be added for some of the changes, and further cleanup needs to be done