Fixed issue in ForeverBrick.java and updated tests