Refactor tests to use bins/