Some things changed/disabled, Things with @Transient need to be done right, else tests don't run at all.