updated tests for new features
fixed last commit, added a bunch of comments