Tests refactoring
Merge tag '2.04' into COMPOR

Conflicts:
	src/test/java/br/ufpb/dce/aps/coffeemachine/CoffeeMachineTest.java