Add some (unpolished) tests