Finished adding styles, refactored tests