Improved tests overall and added parts of entities