Added test for crystal info and some small fixes