refactored test + styling