- Fixed Broken Tests and renamed some stuff