Added tests, fixed a few things.
Remove test focus.