Restructure tests, add b-encoding