Fixed some unit tests, abstracted styles