fixing tests
distinguishing between rectangle fill and border color
fixing packages