Fixes and super basic working tests. Need to be fleshed out.