More tests. Some fixes I guess.
Merge branch 'master' of github.com:akimsko/box