Completed Most problems and updated some tests

This should be only committing to my fork, but this is my first time
using this tool, so apologies in advance if it ends up somewhere it
shouldn't.