Refactor | Beverly | Clean up imports, delete redundant test